merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 31 Jan 2011 02:11:30 +0000 (11:11 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 31 Jan 2011 02:11:30 +0000 (11:11 +0900)

Trivial merge